simplified and updated schema