Add singleton pattern
Correct comment in state