Added compatibility to the other versions