Added tooltip support