Model structure needs fix