Adding checks to properly support the dependency types.  Fixes #4