Suggestions for replacing Habitat implementation