Adding Okera for Maverick and Goose (RIP)