FIX: Added proper init template