Golem and Skeleton classes updated