Some updates to Constants