Adding AF related changes