Add some dependency checking