HCSVLAB-729 Add unimplemented methods + refactoring + bug fixes