Fix Get function, improve interface.