Feature/#395 create base