Added oceanic support