Implemented GJP-21 Feature events