Added homesick compatibility