Some changes for reuse