Add new role for methods that are constructors
Update TODOs