Added organization, organizationalUnit and organizationalFunction + fixes