More work on State object