Add Guard for dev