Improved tanancy
Added hierarchy to users, fixes #35