Removed container as dependency on various classes