updated schema and added more things