Added Graph and Area classes