New constant
Improved how current user ID is resolved