Add support for members