Added title handling