Fix import path
Better support for @ in templates