Additional debug options added