Added implementations