Recommendations

based on Djakarta-00