Added class finder. Imported from Mbrao