Pinch abo.enum from six.enum
Improve account parsing