Added user properties
Added locks tracking