Fixed custom types and moved common ones into types.py. (#1587)

Fixed custom types and moved common ones into types.py. (#1587) #642