Further implementation of compatibility