Changed dependency to interfaces, cs fixes