Improve embedding flexibility.