Started some work to add support for Apache