Merge "Improve @var on User class"