Updated with soainfra schema details