Add filename parsing to server