Wp/refactoring/psedo serial