Modified interface and impl