Finished implementation of handling for current state records.