Export class bundle and fields
Fix on install and update