Added custom object and controller for data