Add fields to core classes