Pulling methods up to singleton