added more pre-processors