Added support for user-friendly names