Framework related changes. No impact on logic