Improvements and fix bugs on Application and ServerApplication features