Added more class checks
Added url check support