fix templates, bump version
add entity support