added Objectify support