Enhanced version of userCake 2.0.2