Moved some functionality to a common file