Basic support for feature 520