Changed class import
Added back missing blocks parameter
Removed home module