Updating for better template support