Adding more items and cleaning up models

Adding more items and cleaning up models