Replace with current Objectify codebase