Changed parameters to interfaces