Updated with new User-class and reconfigured settings