Created dedicated class for Fields and implemented a new Filter system