Added support for basic composable block finder