Rafactor and AddClass Item