Fix object checking method, add constructor arguments for enhance()