Update to include classes package