Changed to add apache2 support