Remodel task and user and make them work