Add Property for workaround