fix annontation and use the container interface