Cleaned up the way title id and relay is handled