Added cart controller & updated models