Added fluent mapping and queryhelper