[TASK] Fix import issues with decoding and overriding