Added implementations details