Added initial generation of type equations