fixed missing dependencies and alternative definitions