Use abstracted define instead of specific defines