Bug fixes:
	- SetupHandler, refactored to use BlockFactory