Revised version with better normalisation to db

Added new data and schema objects