Added new live function and fixed template dependencies