Wrapper check added if class is filled