Implemented missing rules