Correctly handle STI classes when adding roles