added NotNull attributes
added support for spherical maps