Updated Constructor functions