model changes and added cascading relationships