Clean up extende values set / get and naming