Modified Database schema, added validation in areas