ACV-15: Refactor
ACV-15: Refactor after merging