Work in #84 update & construct role edit