Converted several classes to java beans