Changed intent
Removed stuff which would get run everytime someone imports this class otherwise.
Added dependency features