Updated ABase, ABaseTypes, ATypes