removed claim.feature, added before and after hooks