Cleaned up enum for AX container types