Add support for restrictions
Format changes