Move role feature to a concern