Added DataMapper and JSON Configuration Support