Put more contraints on  schema (issue 61)