Modified files for ha functionality