Improved various methods