Cleanup new use of template for features. Serialization ok