Added contracts for non-tracking methods