Roxygenized and added poc scenarios