Added declared classes;
Added defined functions;