Adjusted soa-5.3.1.GA to new requirements