Split debatable features into separate file
update