Updated and finalized Constants