New entry point. Sample classes removed