Adding options and debug stub