Adding checks and guarded checks on startup