Updated bean structure and added filters for nullPointerExceptions.