changed mappers for new graph model