Moved cuba class redefinition out.
Headers helper