Added Bug support