Move some definitions