Added a compatability layers