The master plan also included changes which will be implemented under Fraport-Greece's investment plan prior to 2021. They include the remodeling and expansion of the current terminal as well as the construction of a new one. A Hold Baggage inline Screening System (HBS) will improve safety and efficiency, along with the refurbishment of the airport fire service, which will benefit from the reorganization of the airport apron area including the replacement of paving in this area. Also planned is the increase of the number of check-in desks from 22 to 28, and the number of departure gates to 12, as well as reorganisation of the security check lanes in the terminal.