Extended the interface a bit