Moved shared functionality to shared helpers folder