Change the way fields is accessed to ensure that it's class specific