declaration rules moved to separate file, added some more rules