Improved performances and code modularity