aded some aliases changes and exports