Fix attachment location overrides
Add config options