Move some methods from master