Added url support and extra class checks