Some methods optimized