Add class to handle calculations