Removed App-Engine and Objectify stuff to keep focus and avoid problems