Added reference types, functions, and Javelin