Added lake functionality