Added 'to' roles support
Interim commit