Fix users type
Fix dependencies on imported resources