Export types as well
Added KeySelectors and a way to resolve them