part of refactor job, added fields scanner class