Added user features and static context