added user related changes. framework changes