Changed resolveDataType() to resolveBaseDataType() and re-added resolveDataType() to return resolveBaseDataType() by default (TODO: resolve reduction in resolveDataType())

Enable multiple annotations (textual syntax workaround was added to support the serialization of multiple annotations)

+ corresponding formatter adjustments