Further move towards object model