Add support for user defined modes