Move source to parameters, refactor request parser