Import bug fix
Templates added