Improved compatibility between source and backend