dev/legacy support optimization