Initial implementation of resolver