Added missing POJOs