Removed ValueView dependency