Added custom user support