#327 Change template storage format