Adding nested 'raw' object to contain the actual template instance objects; modifying the callable templates so they contain function instances.