Fixed DB/Q issue, state model working