Added support for the ID property