Add package and classe see also to optimize