Implemented Avatar aware