Add some function
Simplified type name
Fix this assignment