Added command context & repository