moved resolve parsing to service code