Add debugging and backup