Merge "Refactor Status to be immutable"