Complete #125 implementation