Added checks to see if we use interfaces.