Improve dms base types