Added storing of constraints and related indices.