DataMapper: pass modifying variables to method
Auto-create variables.
Fixed some minor todo's.