Multiple improvements with new usefull functionality