Refactor, removed methodMissing