Add blank lines between classes
Adjust new shift API