Removed ID registry & Custom block