Added optional dependencies