Moved field base into seperate module