Remove I from interfaces and implement better storage classes