Changed structure to conform common model