Handle remaining types and move function to common
Add description