Replaced dynamic method lookup with explicit calls. See #106, #77