Added complex number support