Added custom name feature