Added back Oyster-specific behavior