Moved some code to common module