Improved ItemFactory and MethodFilter