Fixing issue with change to interface and non static class.