Added person roles, changed programme model etc.