Add temp changes to keep classes as pojo