extends mapper
fixed entity class name, untrack method
now it's a class