Added compatibility layer to stay compatible to old releases