Added replacer support
New build