Commit with maps working :P