Add to Goldi design/impl