Added overridables support & fixed a minor bug