Started to add accessors and composition