Improve Built-ins commands