reverted bi-directional helpers and fixed setters