Small update of functionality and perfomance