Fix concrete classes being used instead of interfaces