Added property to allow client based logic