Add check for correct tray class