Separate environment and server_type
Change docs to reflect environment and server_type