Added class namespace for fillFields to work