Added slots and ItemMatchers, Refactoring