Made the interface lookup a bit smarter