HAMA-681: update the interface