Added 'InUseAttribute' and interface fixes