Rearranged interfaces to have an I prefix for clarity