Improve requirements and add extras dependencies.