Some refactor.
Added support for constructors.