Fields have been moved into a separate package