Updated Bay class