ERT-710 / RO-12: Changed method names, added third argument to constructor