Initial commit for apache support