Adding capability for different implementations