Added backwards compatibility for Raven