Modified classes to prepare input