Add attribute mapping support