#262 Added organization input param to role functions declarations

Resolves #262