Added support for long titles