GitHub #57 - Add retain state flag on these models