CUST-156 add override possibliiity