Improve entries save and add Boolean Field