Added additional dependencies and annotated source stubs