Updating to simple POJOs