Add class to insert predefined fields to metadata
Package fixes