Fix #256 by adding support for AOP/1 directly into FW/1