Moved role to decorator