Removed immutable references, see dedicated branch