Feature/commonize