Adding some additional class detection