Fix dependencies to specific versions

Currently using old Enum
resolve conflicts