Added some more @ rules