Added #defines