Added 'resolve' feature for routing