Change to simple state and add static strings to NeedGen