FIX: Updating setup and manifest