Move manager creation
Update jinja import