Updated several features