Completed more features