Change to interface, add time