Removed DataMap
updated api docs