Clearer responsabilities