made Fields partial and added customfield class