add logging and fix datamapper naming change