Rewrite of 'ruby' role, many changes in other roles