Remove base requirement from Master
Extract ShaDetectable behavior into module