Small modification in the interface