Constants and Routes updated