Add defer if not dev