Started adding support for static server options