Added more user authorization support, but still skeletl.