Add support for optional title