added some more SOA