Added inital schema design