Got rid of interfaces