Add controller (while empty), function for buffer search and types