Move the optional dependencies to a separete list