Move some methods to prototype