Moved over to using objectify