added new actor WaterMarkingStatus, cleaned code