Updates to support additional features