Changed POJOs for real