implementing full mapper + integration test