Improve problem struct