[7607] Improvements in support some generic achievement classes