Add support for feature #5