Add support for attributes containing '.'