Some small changes to reflect the working state on the DB representation