Made $args protected and removed a few code checks