Home handler moved to separate file