Some changes for old projects compatibility