Configuration: Custom Decode Update

Some updates but not the final ones