Add more accessors around this ...