Added support for default .do files and cleaned up