Added extensions for Flux architecture support (not finished)