Added demoted attributes to tenancy

As well as adding attributes I've added validation constraints