Initial resolver implementation