added comments entity - have to generalize that one, switched to mapper_binder - have to fix that one