added more typedef declares