Adding backward compatibilty