Removing habitat dependency