Added optional deps