Fixed system helper namespace