Added rudimentary method support and some other small changes