Optimizations + additional commands