Refine annotations
Improve if-statement condition
Implement type bulder
Implement type parser
Fix bugs that caused by type parsing