Added POJO modules