Including templates, fixed dependency to spark