Update

Added exports and last changes