Changed type and check for topic