Moved some code to the facades common