Added invoicable check and an user.