Begin optimization

Add class