Adding Homesick compatibility