Added handling for hassle factors and authentication