- Moved GAF constructing to GAFConstruct