Added initial POJOs