added domain and json POJO mapping