Refactoring lang type
Fix list bugs