Adjusted soa-5.x to new requirements