Add flexform for content but dont change features. If you use it after upload, go on all your content with this extension to make new configuration. Coming soon : pi1 class with new clean better code.