Moved role constraints into model and fixed typo