Added support for non-admin users