Dependency fix + Local/Remote Library support