Refactory to remove post service