Changed ID implementation to property