Add support for title (still needs work)