Add templates support. Bump version