Initial AtlasAPI changes