Adds backwards compatibility