Minor changes to models, added design table