Some updates for the system