[IMP] Use attributes instead of replace