Added support for custom prompt