Changed some concepts and dependencies