Moved generic helpers into own namespace