Put logic expression parser functions in its own file
Add server provided requirements corrections