Added otto support