Moved POJO service into common