Refactor block registration class