Exchanged class dependency to selector dependency