Moved files from common prototype