Added missing functions from the old template