Soe changes to meet AppFab needs