Filled in more placeholder definitions