Updated, added and removed constants