Adopt to use master