Some changes required by actual implementation