FIX: Fix deprecation
FIX: Fix setup