added maps
ref: DataCommands. become more testable :)
async operations are now testable