added better custom mob support