Added Contact and Customer, changed handling of requests to User