added unique and non-null attribute addition to schema
Slight modifications here and there