Add appropriate getters to BOs and use them in CLI