#78 extracted decorator rules to separate file